Merge changes made in Gnus trunk
authorLars Ingebrigtsen <larsi@gnus.org>
Thu, 26 Jan 2012 10:43:01 +0000 (10:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 26 Jan 2012 10:43:01 +0000 (10:43 +0000)
commit8dee6be11064342e8067d654217c2ede45fdb412
tree583afce2d45135cfdbaa51f0eb643ad080ab02b7
parentc8bce3c79a9a6cfd387c860459db9c829a0deab7
Merge changes made in Gnus trunk

nnimap.el (nnir-search-thread): Autoload to avoid a compilation warning.
gnus-sum.el (gnus-summary-line-format-alist): Don't try to macroexpand the nnir things, since they haven't been defined yet, and nnir requires gnus-sum.
lisp/gnus/ChangeLog
lisp/gnus/gnus-sum.el
lisp/gnus/nnimap.el